Commence design changes to address issues #12 and #17.