Fixed string quotes
Fixed error in database seeder
Test code before committing...
refactored to fix bugs.