#1 and #2 mostly finished.