consolidated into one role. fixed namespacing.
fixing merge