progress refactoring action options
herpdederp
Merge branch 'master' of github-EDINUNI:blakehawkins/billy-the-silly