1) Added "when" attributes to line object 2) Added classification of "when" constructs 3) Added tests