Manually copy changes from chad-dev
Somehow I took the wrong files when merging commits