Major changes

Down to a few errors. Still doesn't run properly