Started working on #41