Commit all the things

- Everything i've done so far.