login
login updates
updates
updates
initial search
merge2
defualt search working
merged in master