Filling out more of front-end