Implemented more things