first part of the finals checkin
Final checkin #2