Just checkin a giant blob of old stuff with tests