More fixes
More files for integration
Add backend work