renamed some commands, and start splitting the mammoth function