DO NOT MERGE - FOR INTERNAL CODE REVIEW ONLY

I believe the author of this code has on more than one occasion chastised me for having magic numbers and strings in the code