Finished dev-sprint2