Merge/logan evans irwinj

@LoganEvans, I merged our two development branches. If you're ok with the changes, please merge.