Resumission of previous changes

I pulled the latest branch and remade the changes I attempted to submit last time. I haven't used Git for too long so if I'm missing something please let me know.