Got Select/Edit working