Mostly finalized changes

Everything seems to work, yay