Added a few methods and working from initial tests