Architectural changes
Typical retarded git merge