refactoring to akka almost done
merge