Image editing is working. Source code needs cleanup.