Working

Everything working with 2 test cases.