Did some stuff.
Fixed OO.