added a few things here adn there.. not quit done