Should this be a static class by default maybe?