Do away with all static methods to make more API-like