Second stage - added image loading etc