Lots of tweaking and front end work