Adding all the old dev code to project