Dev 1.0

Done po thanks :)