Database working, some adjust, work still in progress...