More towards two new modules

some issue with setup without calling reset