A bit of a refactor with episode 2. Decided to ditch the Yeoman template stuff.