initial commit
initial commit of untested code.
Merge pull request #1 from durandal79/master

Untested code