Split static functions off to separate class;