Scala-style functional + Changes Jona's repo