Continuing tradition of terrible commit messages on this repo