Fixing timing analytics
Add database
Add flagging