Got rid of unused MainController and made deletions less janky (can't test because Schedulables broke adding)