refactoring almost done, main 7 stacks work again