Implemented a few more required functions