Updated the ERD and UML as well as added block code