Revert "Revert "Completes stack, all tests pass""

This reverts commit 8bba36dde156741b9f70c36aa0710dfce6410534.