Probably true. May want to wait for a heavier refactoring though.