add - handling for statements not accepted by the parser
add - new state placeholders
mod - substitute state macros to clarify logic
add - processing for command fields separately