Add Data Service and seperate concerns between it and controllers