Thanks for pushing me on this - refactored into the abstract class and found a bug :frowning: