Merge in front-end work