Fix comments
Move Wrapper class
Implement span()