Moving to a convertable adapter type pattern.