probably final commit, for some reason swapping just messes things up and terminates the process early. I can't figure out why, but at least it's semi-functional without breaking anything.