concept works
test structure refactor