implemented picker, added comments
resolved conflicts after merge with PickTACs