finished the newwork good to go
Merge branch 'tbarker-Addingnewfeats'