Tested some more and added ToString()s