Restructure of retrieval, this time it totally works, I swear.
More clean-up