initial code from crevillo

Not part of the scope.