Re-wrote animator and some more metro work