Switch to ulong Dim, add more tests...