Refactor all the things
Resolve merge- accept mine... sorry Kman!