Added picking code, just need to do movement and some refinement for ID's