mass changes

Problem with the coding, show adam
More changes
Overhaul