Refactor. Started work on the web app