Closed #44, implemented design for #26