- Fixed-up a recent bad merge and implemented stubs for missing functionality.  The baton has been passed back now... :)