reorganized, working on bacon-router