braden's changes
add some more stuff
Merges