Worked on wiring things together nicely