Merge pull request #1 from lee-leonardo/master

Hey bud!
moved some things around
I don't know which commit I'm on!