Latest work. It actually passes a spec now! :-)