Today
Merge from hackweek_fps_logging