Updated Code

Includes Database Configurator now.