Started adding core data and services