Push 1

Part 1 of the portal fix