More work on implementing this module