More changes getting more comfortable with concepts now.  Still not in love with the Java version but with Scala it makes a bit more sense.