More work on form, panel, separated modules from defaults
Changed to be more ooccs like