Merge of Jacob's and Mark's code.
Merge pull request #6 from TeamAwesome5u/Mark

Merge Elements from TeamAwesome5u/Jacob