added TODO comments regarding orientation changes