Everything updated. map working and colors going