More schematic work - should be ready for layout