Further work on the front-end implementation.