OO fixed, mix.py added