Lots more work on the revamp for 0.1