Finished fondling.
This is a basic implementation that works.
another big bag of changes