More work on the front end