more mussing about with model loading, nothing usable yet
Merge remote-tracking branch 'origin/master'