Started to add some image handling