Initial work on tag dispatching
Refactored image to use tag dispatching
More fixes
Fix headers