started initial changes to flow to merge with HCDE's UI