added static methods, modular content https://app.asana.com/0/15854117586982/16917144320409