continue adding features back.
Merge pull request #332 from stefanpenner/fix-internal-restructuring

WIP