Major refactor
Merge pull request #1 from ibuildthecloud/refactor

Major refactor