Reorganising and implementing...
Merge pull request #2 from rXn4/master

Some stuff I'm working on