Modified EVERYTHING.
Further testing.