v2.0

capture now works, fight not implemented, need to set limits and review
code