Serious changes, changing all picture stuff to use text