Major developement is DONE

All of this is done... Next is minor changes and clean up!
Merge pull request #22 from UberLame/master

Major developement is DONE