Even more changes and enhancements.
Slowly making progress…