Stuff I did at work

Forgot to sync everything before leaving. Whoops.