intermediate
Intermediate commit. Database operations changed to use user id. High level functions to be changed.