test suite
refactor stack management out of Builder
builder stack refactors
consmetic fixes