Made all into seperate command.