Lets pull these code together

 (trial1 edits to master)