working
Cleaned up
new implementations - new structure
don t use join
Merge branch 'DB'