More birds

I refactored Tiagos code a bit so you can have birds with the same stone.