commiting some broken db stuff to compare notes with alex