cleaning up a bit, starting to get colors in there