Initial commit.  Started refactoring
Forgotten files