Play with color
Fix history bug
Restructure