does some neating up the home module
resolves conflicts on home module