Have most of the topology infrastructure in Java working now