Should we get rid of this class now that we are using the built in one?