Reorganized code, added audio