Another just in case (if I ever want to experiment with ideas for a complete rewrite outside of a MW extension).