Some additional work on selection class

Probably does not work as it stands currently