Re-designed the wrapper system.