Updated

Searches are working
Improved structure (work in progress)
Improved interface (work in progress)