Merge branch 'php-hookup'

it is merged in, functional, needs to be updated