Now editing the main doc based on passing the tests
merging...