Initial commit after db split