More work on both Scala core, and patch.
Stuff mostly works now!