Working on pin/unpin functionality