More changes. Reverted some stuff. There will be some testing to be done.