Forgot to add these to the last commit. It's getting late.