added christina code, but colors dont work
colors work again
merge save