Revamped Edge parser, slightly less complex now