General Warriors star Johnson on track for 2016