mayor refactoring & no promises
merge