Consolidate some files. Avoid using draw in the interface as it is a processing keyword.