Beginning to add refactored php classes