Clean up, started working on portals

Portals not yet working though