Lots of progress on #9