Finished most of the first part of the project