The Big Big Fix Of The Death #2
(Complete front end refactor)