Bug fixin
still chasing...
more fixing and db changing...
Notes done CRD - No U yet