Add and remove pins

put the regexp in a helper somewhere? This can be quite handy