Edits and Testing
Debugging functions and comment/edits made