use when, not if; add todo comment
Merge branch 'wip' of github.com:vlacs/galleon into wip