Working on some frontend code