Lots of progress, but still a WIP