More work on tiles implementation