A step closer to #26 and hopefully to #19, tests lacking still