Add open/close fields, part of #38