First commit in a long time. Much needed refactoring.
Added some of the missing files.
Merge pull request #1 from ikillforeyou/master

Update with latest master