Smarter Listener Parsing. More locks. Documentation. Neatness