Couple Changes

Removed A Couple of loading things
Added A selection conformation