Host entities

seems to work but please review