Changes 8-14
Final with tests
Merge pull request #19 from pumpkincouture/8-15

8 15