Add some staticness where needed.
Start hooking up new image management in the token library