Refactored specs
Added select classes
WIP