A bit more work on (#56)