Add skeleton image and small refactorings