Progress On Scope Adjustment

!!! DO NOT MERGE YET !!!

This is just to keep everyone up2date with my horribly untested code.
Thanks. Copied that from the FCS, will update that as well.