Updating my branch with Angela's recent additions.