Dev 1.0

done po thank you :bow: