[apple4ever]

REBASE IS HORRIBLE! That's a good first step to fix.

(And yes I filled out the survey).