Massive refactor. Broken some selectors :(