adds ability to query just one system
removes login