Building

Got the project to build, haven't tested yet. refactoring code. Commit
to snapshot