Initial commit
initial state
Accidently merged from very old commit. Went back to John's initial commit, merged with my correct commit.