db finally working
orm still working...
fixing merge