Updated header + finished nearly all of the implementation for wrapper.py.