Adding a few blocks of code. Added a TODO about our database.