initial code from crevillo

This isn't part of the scope, is it ?