Organized selection stuff

Please check and suggest any edits if you want.