refactored. pulling/saving in ORM working