all tech works
Merge branch 'nctvyc_sprint2'

* nctvyc_sprint2:
  all tech works