select template feature added

cleaned out a few todos.