Did some cleanup with the databases

and worked some more on the dispatcher (its not a dispatcher yet)