Amber branch for Strand's review

Hi @strand (and @aespaldi ) !!

Here's the latest branch ready for your feedback and code-review on testing.

Let us know if you have any questions!

C.J.