Still in progress
A bit more work.