Can you add some TODOs to all of these temporary bits so that we know what needs to be changed. Also when this goes in, could you file jiras or update existing ones as needed about needing to change these parts.