Cleaned up names for everyting. Didnt test. Have 2 separate classes: for variables and for data. They are different stuff, should be separate.