Started work on a better front-end architecture