Got started on DB and doing lots of small changes