Lots of changes
modified to split off DougModules