++lookups, refactor

++date lookups, ++mysql lookup, ++tests, lookups refactor