First phase frontend work