Testing Complete

Now working as intended