I was rushing out the door and forgot to combine them. That's why this PR was a WIP.