Some work on the frontend