-Removed one line that was causing an error
-Finished implementation