Add more topology stuff and a simple devices table