Beginning to add peices of the old projects, adding tests as appropriate