More state code

Added to town and placeholders for shop, tavern and inn