WIP: Refactoring tiling scheme