Wrapper works! I think
Simplified wrapper parsing.