remove wrap dependency in base..thought I did this already