Work on #75, currently broken