Added the ability to build models with multiple frames containing ranges

Also added new constructor to Model

Removed line numbers from some files