Clean Slate

Wherever we are, I want to have it committed and ready
	on the deploy branch.