Added more structure and code to project