MB-141 #comment moving more things into the common base
MB-141 #comment finishing the build