first steps in factoring out the topology