Part of previous commit. Forgot to add these files.