Almost done

Did a bit more work on this, going to leave it for now and think about what refinements are still needed.