Mostly done with this change but I wanted to commit because my computer overheated and shut down