Continue to rewrite in java

Need to look at visibilities
All Model components need xmlOutput written