Implemented a few more functions