Completed a manual merge

Merged Chewbacca and master branches
now better model loading is included