major refactor to create own data app