stash of logic changes
reconciling merge conflicts
updated checks for c4
Refactor internal logic
Pretty up, more refactoring