Fixed all of the issues, nailed all of the tests