Refactoring.
Copy/paste errors :/
Finished these.