Uncommitted changes

Stuff I forgot to upload