More progress, add colors