Started work on sperating guest / host view