Moved data grabber to seperate class, added errorhandling