put data structures and vars outside of class again