Calendar w. updated db fields

To do:
# Connect to test db. Currently connected to localhost.