Stage 2

Commiting most recent and working project. Fixed database and project
may work!