Pretty much there, which is cool
Merge pull request #1 from adamron1/adam

Pretty much there, which is cool