Huuuuuge push.

I need to remember to commit while I work otherwise this takes to long
and messes things up.