Committing.  Gonna try somethign else.
Improve override pattern.