Finish Testing and implementing Animation