Added fancy animation stuff et al.