Initial work on rebuild-init command