Started working on #34