Made some small changes to certain things that wouldn't be necessary in common anymore. Although, this will break some of the stuff that I was attempting to do before.