merge
merge
got search to work with views.py, closer to final solution