Incorporating Research & Project-Based Learning in Undergraduate Courses