Commit includes large swath of changes which includes lots or refactoring.

Signed-off-by: Daniel Connor <dconnor@catalystitservices.com>