A bunch more changes, etc... 

Mostly just drafting at this point