Pulling out the code from my last commit that doesn't require a database update