Various tidying.
Starting to wire things together.