Work in progress (reformated code using the Zend standard)