Some work on #2