More of the code move done to new graphics file