Initial commit of homecntrl
Merge