hopefully chagned this branch such that only changes are in main.ts