commit for the merge

-got some good stuff join on