Merge in additions from recent projects