Implemented some more stuff