adding all of Dan's changes for reference
more develop_january merge