Need to finish issues #14 and #15