Major refactor + unknown command numeric