Adds more stacks.
Bugs have emerged, but I think I band-aided them...