last commit before playing with core data...