We'll want to remove the commented code before this goes into master, but since this is still a work in progress we can leave it in for now if it's helpful to you.