Add and make use of setters/getters
Merge branch 'master' of github.com:opatut/arachnonoia
Fix little git merge derp
Merged