rudimentary gif support
total reorganization