It would be nice to not have internal static functions in the header, did it need to come out for tests to work?