Redid most of the project and finished off the remaining functionality