Updated to pull data from seperate service factory which will eventually pull from the server