Added an Implementation of a Database
Rearranged some other Code