Began work on implementing Actors as well as further work with pattern matching
Fixed some merge problems