First commit of the new HA