Commit in case I'm about to mess things up in this semi-major change
IT WORKS (mostly) AND ITS SO BEAUTIFUL I CAN CRY