List expansion work in-progress
New expansion algorithm