Refactored LOTS of classes, and implemented object collision.  Avatar face does not return to original, however.