Removed inetrpreter and refactored some code back to how it was before that