Sandbox

Fixes and additions. See attached.