initial work on #56