Rework a ton of properties. Only a few remain.