Adding Swish animation and updating as state machine