Major Topology Review

Lots of changes, separated graphics draw from logic. sort of..