Adding in all the mods that make for v1 proposal