Dev 1.0

done :)