Merged with Logan's Stuff

Hopefully this won't break everything