Topologies

Merging topologies branch into master