Add home controller and user and text tables
merging in master