Almost finished dealing tests. Need to merge before we proceed