Initial steps to refactor into string based commands. Not mergable just yet.