More work on CakePHP conversion