Merging more of the feaeture commands into issue.

- This mimics less of a hotfix and more of a feature. There's still some tweaking but
basically should work very similar now.