Conversion Pt.5

Continued update of more conversion from Java -> Scala