Some more progress, should be able to drive next week