Some serious reorgination and searching finally working