Remove commented stuff
Integrate interpreter loop for running after tests