Started work on the front-end logic