Commit so I can rollback when I mess up

I'm probably going to break everything ... so committing what works so I
can rollback (probably in the next 10min)