Changes 8-26
Changes 8-27
Refactoring 8-27
Refactor 8-27
Changes 8-27
Changes 8-28
Changes 9-3
Merge pull request #1 from pumpkincouture/9-2

9 2