schema overhaul, restricted routes good, broke some unit tests