Addressing initial scope of #12 and #13