Command updates, still needs thorough testing