Added select, still somewhat buggy