Continued working on #115, still a number of bugs