Selection added. Still needs work.