more WIP on the frontend