New tile types
Lots of changes