added more schemas and beefed up existing -- failing build bc im calling it for the day