First run with fancy data looks good
Added option for expansion