paper
merging master into mikabr
setting up testing to run with distributed grid