Simplifying refactor
stash of logic changes
reconciling merge conflicts
updated checks for c4