Adding controls to bikeProximity
Fixed merge conflicts
Actually fixed merge issues