Committing for migration of pc

Complete with e2e tests, 26 passing