Made progress on the frontend