Scala migration

Still getting goofy merge crap.