Also the looks repeated in two places -- should be factored into a method in base if so.