Working copy

Working copy from production. Refactoring can start.