Tidied up the code, works partially. working on multiple executions beginning now in another branch.


Signed-off-by: parhamfh <parhamfh@kth.se>