A bunch of updates
Merge pull request #5 from ianbutler84/practiceBranch

A bunch of updates