Implemented more stuff