Image service

Implemented the basic image service switch. Merging it back to patched-1.2