major issues with current data structure