More changes, turning project into more of the One-Stop project