New tile

We should merge these, and clean up the code before working on anything else.