Rewrite of the frontend, more sensible data format