working on fixing the breaking of the animation, will try to fix more later, going to begin integrating all of our parts