Elk/pr/370

Picked previous Josh's PR for review.