Forgot about this for a while, made changes I never commit.