Add concat; add test
Refactor build system