cleanup
Rename
disable typescriptish types for now. Needs work