statics replaced by selfs and Optional
#34
Draft
Loading
statics replaced by selfs and Optional
#34