More major changes

The most so far.
Almost done