Work in progress on cleaning up graphics package