Scalafied a lot of commands. More to come