Add spec for moving items
resolve conflicts on KineticContext