Continued work on #20 and started work on #37