stuff here

I've finished this branch and would like it merged.