Changed up some files to fix an issue with gocheck and have basic implementation of Query-Current working.