I fully expect so. Be sure to also add 334 to your portfolio. https://www.irs.gov/pub/irs-pdf/p334.pdf and we certainly hope Pub 535 will come out soon as it has the reader's digest version of QBID. 

And when all else fails, read the overlying instructions https://www.irs.gov/pub/irs-pdf/i1040gi.pdf

This looks like it is going to be a fun year.