replacing that string based nonsense with a concrete class that will make things slightly easier