WIP
Add basic picky behaviour