Port all but a Couple Model Sources from Java to Scala