New models and got DB working