parse now includes function defs