bla
Merge remote-tracking branch 'origin/master'
initial attempt at interfacing with core data
bla