Fixed the datasource (haven't deleted old yet), created a dataRetrieval class, fixed start up