Refactored core
Adapter graphic to X
X is now clearing correctly