Revert "Part1 WIP"

This reverts commit 95ae4d1c86e77dff0c8aea78c074efc8986ad5b1.