Changed first class to scala (some will still be java)