Changed some function names to make it clearer / enable naming of future functions
Merge commit 'f6f1cd0d8957e68850d01a9276f964692ada97d4'
Design fixes
Merge branch 'master' of https://github.com/edlongman/whileaway