Added colors, made drawing test