Finished main codebase, on to testing