initial commit of swhcp work so far