Initial work on sandbox mode