Restored clock.py and sandbox.py to aid in diff
Changed context.py and sandbox.py to correct the errors