Trying to refactor ABM-228.  Creating bug ABM-248.

Signed-off-by: John Mulholland <john.mulholland@rsginc.com>