This is my first commit
Has all the working code from the most recent version