major work in checkout and search functionality
merge