Better parsing system

Signed-off-by: Ben Jackman <ben@jackman.biz>
wip

Signed-off-by: Ben Jackman <ben@jackman.biz>