Getting ready for plugins, search is borked at the moment
Almost ready for plugins, got timing issues sorted