Replaced `states` with `section` objects
Added commments, added triggers to section objects.