add in checking for shorthand functions and args