change interface - submodes to modules
needs testing