more schema stuff -- still not right, but closer