More changes

Still kinda want to rework the whole thing...