Working on adding ComputerName functionality