Solo2

Modularise position chart and table