Updated to include some search functionality. Gunning for that first!