small refactor and addition of edge information table (as well as stubs for others)