Continued working on #37