animations working, time for some refactor