Improved delegation to allow for local overrides.
Improved delegation to allow for local overrides.

robotpony/Presto,robotpony/Presto,Discovery-Software/Presto,Discovery-Software/Presto,robotpony/Presto