Some refactoring and building out front end block