Finished up all methods, just need to do cleanup and refactoring