Made the OOP stuff a little bit more logical, started working on the phase animation