working on getting updates to go through. currently getting context errors from CoreData.
Merge remote-tracking branch 'origin/master'