selection working, need to clean up