Model development for beta

Testing some merging of different features.