After I make this change I want to start looking into use a template for it. What do you think about that?