TONS of Functionality and Unit Test Fixes