Interpreter working again, with better modularity