Paultag/feature/picasso

Depends on #634 and #633 (for no reason other than ordering)