Wired up more stuff to come from the DB