fleshing out some of the endpoints
committing merged files