Added the home consolidation changes, and switches for the extras