resubmit previous PR into restructure branch

Moving proposed changes for Models / working with data from master to restructure branch

REF issues #42 and #43