Merge with Meng's changes, figure out submodule stuff