Aaron Hurt

Slight rework taking into account comments in the thread and rebased off current master to avoid merge conflicts.