Testing version

Test version logic working fixing bugs & adding extra things