merge Nevy and Stephani code/ completed backend