Feed the first step of refactor from selection

Closes #25