commit it all
merging?
remove submodule
hooking up