Work in progress

Figuring out which selectors to use
Removed unused functionality. Stabilized behaviour of core functionality
Merge branch 'Selectors'
test
Merge branch 'Selectors'