Implemented some more of the unimplemented methods