There's a box and an x!
Merge branch 'micah' into ryland
Wowza, camera!
Fixed glitch with overlay in the tree