switched x & y variables to correct row & column variables
refactoring x & y into row and column
more refactoring on important classes