First take at autowrap conversion