Liu Dongcheng wip by me

Some more progress