tenative functionality
Merge branch 'master' of https://github.com/Tenari/ZapClass2.0