Scala Rework (WIP)