Cleaned code, working on Tiles...