Heavy work on the front end...