WIP on #32 #16 / Complete #10 #15 #19