Begin refactoing of master sum up