Got all the tests cases passing.

I got all the test cases passing. Probably might require a little bit
of work but its getting there.