Finished implementing 'wrapper' feature