WIP on frontend changes