Forgot to include some things in commit