in progress
Fixing compile errors
More compilation fixes
Fixes
Fixes
Fixes
getting rid of integer ids
Remaining changes