Changed if/else to case statments, fixed some errors, and created a few new methods.
Implemented delete method and done some other minor code changes