A rewrite of Data Jockey, cleaning it up..