major rewrite
Merge pull request #6 from scalp42/rewrite

Major rewrite