Patched Project 1, All test pass

refer Design doc for Structure additions, code changes and additions