Worked more on the commands, working so far