Tons of changes. Forgot to commit earlier lol.