Initial commit

Initial messy commit. Will clean up in next commit.