Made some updates, using core data and some new api calls