Sort of updated the picture handler - not working

Will actually add some test units now to work out what is going on!
I'll be testing the rectangle trees primarily, as they are the most
complicated area.