Fix status and lots more specs
Merge branch 'master' of github.com:MatthewCallis/HotDogPrincess