Very messy commit of more Frontend work