Made more Object-oriented
Also fetch images