more big changes. hoping nothing breaks