reorganize for testing
working with c9