Yet more front end work