I finally got around to doing a little more work today....