Catchup

Here's work completed that needs to be merged in.