good progress

[Edited final time slightly to account for late Cortex split. ~Cameron]