More progress for final project