Some more changes.. at least my database works!
Everything just about works.. Want to keep a copy while this is still true!