I seem to spend a lot of time dealing with Akka changing packages and getting rid of classes
About to merge
Now master works
I did some reformatting