Moar tweaking commits. Getting close.