Complation of weeks worth of commits, merging to triple check main functionality.
requested review from @d1656298
assigned to @d1656298
Closing as this merge was related to an extention fork
closed
