Adding in a refactor note; soon.