Various sweeping changes to the whole app