got wrappers functional, time to add swapping now