Seems a bit weird to have this, I think we can clean this up and make it simpler.