Temporary commit. DO NOT USE.
New data retrieval system is complete (sort of). Schemas still need to be fixed though. This should work in most cases.