Initial prelim port to PHP53 and start of PSR