forgot changes
tests almost running, database write-then-read problem
remove junk