Xp poppy

Fixes #20