Final commit for submission

This is it. Test cases 1 and 3 work great. 2... not so much. (Sometimes)