working on core data shit
Merge branch 'david'