Related to #3, add some more colorizing