Implemented update path and made some massive structual changes
Test
Merge
Merger