major refactor of db schema/frontend/backend for parsing according to branches