Add sandboxing
Refactored.
Fixed build version