added whatevs
added kias changes
did some work