Initial work on changing to a character model
Merge branch 'master' into model