Iwillig/extract tile class

WIP