More work on new action parser