Refactored select specific stuff to it's own file