Dev 1.0 First Pull Request

this should be in Thread po