Add line-level class structure draft