Implemented all that was to be implemented ;)