Implemented some more