Moving to external files, adding select