Merge branch 'owenleonard/ht_sandbox'