Update: Some more progress..