Inital work on the frontend