Refactored front end.