Done some work on the module