Closer merge, think I fixed db stuff
All cucs passing now