changes...
Commit some ugly stuff
Clean up junk code
Add colors