Feature/go crazy select base

Please review it and merge into master :)