split out names, deps, etc
add basic expansion, etc