EOD commit. Refactored GRID module. First interception module now working.