Front-end work, added Boilerplate