Integration for current screens almost done