minor changes, everything working, need to fill it with seed data