Still need to figure out the right solution for this with Jon.