More changes. And my eclipse decided to have every single error
possible. Wooo