Some work on the front end