canfield merge suggestions

work in progress will complete tonight