Completed first half of 2.3 set of stacks