More work on the schematic / layout.