00.40.11.140822

Overhauling some code, broken version