These are good changes to make, I just want to make sure this doesn't conflict with anything @jasondegraw is doing