Map accounts for Y. Fixes #1