2.3/autoload group model

Ok @philsturgeon, early delivery.