Lots of work done, mainly on PHP templates