Updated with working data input, needs to switch synch with services