Adding host form
Fixing conflicts