Started implementing promote process and code refactoring