[rough] First draft of adding support for defining functions
cleanup addition of defining functions
Fixes return point, allows bare function call