CommandStack into separate lib + unit tests