Adding custom pins

@pedroha @bensussman @mmurch merge ready!