Rolled back Rob's masking
this is our final WORKING code!!!!!!!!!!!!
last change...
Merged test branch into master