Implemented a few things