I think this is stepping in the right direction