Added TODO reminder to move to common code area.