did stuff, search works, broken design slightly