Work on #50 & #48