Continued work on #127