Matt

Please just check that you're happy with the changes to database.py and web_server.py...
the code works but it may not be what you're looking for.