I'll fix the pointless bounds check, the TODO can stay since it's a change that will need to occur