Added a bunch of stuff that should have been in the repo