got score structure in there
moved busStop
resolved conflicts