categorize and cleanup
build list and provide test list stub