Lots more frontend work. clear path to end of project