Adding peeps functionality