more progress, still compile errors