Forgot to re-introduce some code I took out as a test...