Partial refactor.
Merge branch 'master' of https://github.com/ZacMcClain/CluePlayer