Implemented some more methods and refactored
Implemented some more methods and refactored