Forgot some things, files didn't merge right.