wip
Merge branch 'new-test' of github.com:conejoninja/Osclass into new-test