More progress. Mostly tying things together at this point.