Tutorial polish + charts attempt