Forgot to pull changes before making new ones when switching computers, hopefully didn't break things too much.
Merged changes, hopefully nothing too bad.