WIP
WIP
Huge set of changes
Merge pull request #1 from ericschultz/WIP

Bunch of changes