Created by: dadlerj
Going to merge this shortly, but let me know if you prefer a shorter bullet for this