Merge back the sandbox containing changes and feedback so far

This will pull back the changes done so far and the latest progresses.