Re-implementing command parsing (in-progress)