current version; around 30 files with type errors to go