Went command-by-command and at least for parameters now it's not crashing (#18)