Added core front end work