Implementation of #20 (Specs to follow)
Adding specs for #20