Implemented some of the missing methods

Takes review into account.