continued development: new section, refactoring, cleaning up