fasdf
Cleaned up some (now) unused code. Close to having selection complete.