Moved mayor_app back into code