Started fixing thinkpixellab/flatland#12