Committing major changes to get newest front-end