Fixins
Services converted to modules
Users converted to modules
Groups converted to modules
Use current_host helper