More progress towards circuit diagram