WIP for now.

Keeping a lot of changes local for now. Want to get a lot more done now.