window_data_layer.cpp is annotated. windowpair_data_layer.cpp is now just a copy of window_data_layer.cpp