Defo need a better name, otherwise it can be even worse with people getting confused with the other class.