Mostly working, just need to get the argv 1 and 2 working correctly