Cleaned up code
Implemented Database

Runs