Finished adding all schema stubs, refactored some