About to change detecting boxes to actually return the said box instead of just returning a boolean.
Merge origin/master